snapshot: Convert GtkSpinner

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index e02e43fbca44b47a5a469df1498d23046a740055..397f79e2b77cb96b95128495da4627353138896b 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -861,20 +861,17 @@ void
 gtk_icon_helper_snapshot (GtkIconHelper *self,
                           GtkSnapshot   *snapshot)
 {
+  GtkCssStyle *style;
   GskTexture *texture;
-  GskRenderNode *node;
-  graphene_rect_t bounds;
 
   gtk_icon_helper_ensure_texture (self, gtk_snapshot_get_renderer (snapshot));
   texture = self->priv->texture;
   if (texture == NULL)
     return;
  
-  graphene_rect_init (&bounds, 0, 0, gsk_texture_get_width (texture), gsk_texture_get_height (texture));
+  style = gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self)));
 
-  node = gtk_snapshot_append (snapshot, &bounds, "Icon Helper");
-  gsk_render_node_set_texture (node, texture);
-  gsk_render_node_unref (node);
+  gtk_css_style_snapshot_icon (style, snapshot, texture);
 }
 
 gboolean

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index db1316ec1a66946c06575e95b809630242dbd37d..b11c80655a749f156019be470f36a04270d2d39f 100644 (file)
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -115,13 +115,11 @@ gtk_spinner_size_allocate (GtkWidget     *widget,
   gtk_widget_set_clip (widget, &clip);
 }
 
-static GskRenderNode *
-gtk_spinner_get_render_node (GtkWidget   *widget,
-                             GskRenderer *renderer)
+static void
+gtk_spinner_snapshot (GtkWidget   *widget,
+                      GtkSnapshot *snapshot)
 {
-  return gtk_css_gadget_get_render_node (GTK_SPINNER (widget)->priv->gadget,
-                                         renderer,
-                                         FALSE);
+  gtk_css_gadget_snapshot (GTK_SPINNER (widget)->priv->gadget, snapshot);
 }
 
 static void
@@ -196,7 +194,7 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
 
   widget_class = GTK_WIDGET_CLASS(klass);
   widget_class->size_allocate = gtk_spinner_size_allocate;
-  widget_class->get_render_node = gtk_spinner_get_render_node;
+  widget_class->snapshot = gtk_spinner_snapshot;
   widget_class->measure = gtk_spinner_measure;
 
   /* GtkSpinner:active: